From: Jan D. <jan.h.d@swipnet.se>
Date: Thu, 11 Mar 2010 10:05:39 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8236^2~12
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5e79a54b3227b1bb81d367bd6a4e80d296c61eaa;p=emacs.git

Merge from trunk
---

5e79a54b3227b1bb81d367bd6a4e80d296c61eaa